remove ICONV patches, glibc version is to be used

diff --git a/debian/control b/debian/control
index 79a61228fea6e4bca565c07d407e8ac6d0454515..256ef9438bd75b95dc6f035a7755ae53e00ee842 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Priority: optional
 Build-Depends: cmake,
                debhelper (>= 9),
                libcharls-dev,
-              libunistring-dev, 
                libpng-dev,
                libsndfile1-dev,
                libssl-dev,

diff --git a/debian/patches/localcharset-include.patch b/debian/patches/localcharset-include.patch
deleted file mode 100644 (file)
index 8590a90..0000000
--- a/debian/patches/localcharset-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ofstd/libsrc/ofchrenc.cc
-+++ b/ofstd/libsrc/ofchrenc.cc
-@@ -288,7 +288,7 @@
- 
- #include <iconv.h>
- #ifdef WITH_LIBICONV
--#include <localcharset.h>
-+#include <unistring/localcharset.h>
- #endif
- 
- #define ILLEGAL_DESCRIPTOR     OFreinterpret_cast(iconv_t, -1)

diff --git a/debian/patches/series b/debian/patches/series
index 59fd29289406cb165e6e4c46b4226ef150069825..c7ae91036618d8a106c41d9e32e59d133ee5a30b 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,3 @@
 06_soversion_abi.patch
 07_dont_export_all_executables.patch
 08_remove_system_processor.patch
-
-localcharset-include.patch

diff --git a/debian/rules b/debian/rules
index 39595348c0d17bedc4c5225569c0514e4e6daf49..bc97d603fb5706da0addbcd058ee7964cb490a88 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -36,9 +36,6 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \
  -DDCMTK_WITH_TIFF:BOOL=ON \
  -DDCMTK_WITH_ZLIB:BOOL=ON \
  -DDCMTK_WITH_ICONV:BOOL=ON \
- -DLIBICONV_LIBRARY:FILEPATH=/lib/$(DEB_HOST_MULTIARCH)/libc.so.6 \
- -DLIBCHARSET_LIBRARY:FILEPATH=/lib/$(DEB_HOST_MULTIARCH)/libc.so.6 \
- -DLIBCHARSET_INCLUDE_DIR:FILEPATH=/usr/include \
  -DUSE_COMPILER_HIDDEN_VISIBILITY:BOOL=ON \
  -DCMAKE_VERBOSE_MAKEFILE=ON \
  -DDCMTK_INSTALL_DATDIC:STRING=share/libdcmtk11 \